Fix more problems detected by fuzzing in #4389 #4411
+181
−78
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.